From df301601c872b1c59c55928082a0e1e971b5ba5d Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Sat, 8 Sep 2018 19:18:37 +0100 Subject: [PATCH] allwinner: Pass FDT address to sunxi_pmic_setup() For Allwinner boards we now use some heuritistics to find a preloaded .dtb file. Pass this address on to the PMIC setup routine, so that it can use the information contained therein to setup some initial power rails. Signed-off-by: Andre Przywara --- plat/allwinner/common/include/sunxi_private.h | 2 +- plat/allwinner/common/sunxi_bl31_setup.c | 2 +- plat/allwinner/sun50i_a64/sunxi_power.c | 2 +- plat/allwinner/sun50i_h6/sunxi_power.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plat/allwinner/common/include/sunxi_private.h b/plat/allwinner/common/include/sunxi_private.h index 6c9c509c..a2d7c38c 100644 --- a/plat/allwinner/common/include/sunxi_private.h +++ b/plat/allwinner/common/include/sunxi_private.h @@ -14,7 +14,7 @@ void sunxi_cpu_off(unsigned int cluster, unsigned int core); void sunxi_disable_secondary_cpus(unsigned int primary_cpu); void __dead2 sunxi_power_down(void); -int sunxi_pmic_setup(uint16_t socid); +int sunxi_pmic_setup(uint16_t socid, const void *fdt); void sunxi_security_setup(void); uint16_t sunxi_read_soc_id(void); diff --git a/plat/allwinner/common/sunxi_bl31_setup.c b/plat/allwinner/common/sunxi_bl31_setup.c index 94b123a6..8f597c39 100644 --- a/plat/allwinner/common/sunxi_bl31_setup.c +++ b/plat/allwinner/common/sunxi_bl31_setup.c @@ -148,7 +148,7 @@ void bl31_platform_setup(void) sunxi_security_setup(); - sunxi_pmic_setup(soc_id); + sunxi_pmic_setup(soc_id, fdt); INFO("BL31: Platform setup done\n"); } diff --git a/plat/allwinner/sun50i_a64/sunxi_power.c b/plat/allwinner/sun50i_a64/sunxi_power.c index eaca0af5..48d01d0c 100644 --- a/plat/allwinner/sun50i_a64/sunxi_power.c +++ b/plat/allwinner/sun50i_a64/sunxi_power.c @@ -126,7 +126,7 @@ static int axp_setbits(uint8_t reg, uint8_t set_mask) return rsb_write(AXP803_RT_ADDR, reg, regval); } -int sunxi_pmic_setup(uint16_t socid) +int sunxi_pmic_setup(uint16_t socid, const void *fdt) { int ret; diff --git a/plat/allwinner/sun50i_h6/sunxi_power.c b/plat/allwinner/sun50i_h6/sunxi_power.c index 0a62eaa9..7bdac8ab 100644 --- a/plat/allwinner/sun50i_h6/sunxi_power.c +++ b/plat/allwinner/sun50i_h6/sunxi_power.c @@ -68,7 +68,7 @@ static int axp805_probe(void) return 0; } -int sunxi_pmic_setup(uint16_t socid) +int sunxi_pmic_setup(uint16_t socid, const void *fdt) { int ret; -- 2.30.2